diff options
| author | Scott Main <smain@google.com> | 2012-10-04 11:52:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-04 11:52:41 -0700 |
| commit | 2babbe19a369b940bb25a8ca1bea0d3037bffd46 (patch) | |
| tree | 8f43deb96618225a5bd67edbac7281d5df84febf /docs/html/sdk/api_diff/16 | |
| parent | 18c2b6e730f6d639421e45328f4fb2514683efe5 (diff) | |
| parent | c3b8a9b6d03283c77d179e1f6293a6319c91e6e6 (diff) | |
am c3b8a9b6: am bc7a20a4: resolved conflicts for merge of 78866b71 to jb-dev
* commit 'c3b8a9b6d03283c77d179e1f6293a6319c91e6e6':
Doc update: TTL change.
Diffstat (limited to 'docs/html/sdk/api_diff/16')
0 files changed, 0 insertions, 0 deletions