diff options
| author | Sander Alewijnse <salewijnse@google.com> | 2014-11-07 22:39:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 22:39:38 +0000 |
| commit | c4ba2174743c877e28bb28e7ff50bc7a55a660fc (patch) | |
| tree | 2644621977acb276c3e7dacaf8f60521194cbe75 /core/java/android/view/Display.java | |
| parent | 75d1cbd71b6ac72588b687c8191a0ceded183b39 (diff) | |
| parent | 1b0dbd5c954b61e2ee95f87817a1ec0e7d242b20 (diff) | |
| download | frameworks_base-c4ba2174743c877e28bb28e7ff50bc7a55a660fc.zip frameworks_base-c4ba2174743c877e28bb28e7ff50bc7a55a660fc.tar.gz frameworks_base-c4ba2174743c877e28bb28e7ff50bc7a55a660fc.tar.bz2 | |
am 1b0dbd5c: am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev
* commit '1b0dbd5c954b61e2ee95f87817a1ec0e7d242b20':
Added the restrictions pending application restrictions key.
Diffstat (limited to 'core/java/android/view/Display.java')
0 files changed, 0 insertions, 0 deletions