diff options
author | Dirk Dougherty <ddougherty@google.com> | 2014-02-12 21:19:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-12 21:19:00 -0800 |
commit | aa4cfa0c3a04ea1289994a530044e111f21a439c (patch) | |
tree | 674cec9b923196a97aa83e9be5f3d825e42087ca /tests/permission | |
parent | 1fc47a071b45368e6da0601ec640f2547489224c (diff) | |
parent | a97e17785714e5155184199161b3d288f13d0134 (diff) | |
download | frameworks_base-aa4cfa0c3a04ea1289994a530044e111f21a439c.zip frameworks_base-aa4cfa0c3a04ea1289994a530044e111f21a439c.tar.gz frameworks_base-aa4cfa0c3a04ea1289994a530044e111f21a439c.tar.bz2 |
am a97e1778: Merge commit \'47d3eaf6\' into manualmerge
* commit 'a97e17785714e5155184199161b3d288f13d0134':
Doc change: minor edits to support easier extraction of document summaries.
Diffstat (limited to 'tests/permission')
0 files changed, 0 insertions, 0 deletions