diff options
| author | Guang Zhu <guangzhu@google.com> | 2014-09-12 23:22:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 23:22:40 +0000 |
| commit | 34c5a6205afcbf0b6480df3a35deb1a16a3eac1b (patch) | |
| tree | cd7556969b7275dc0a442dd9822235988789d5f9 /opengl/java/android | |
| parent | a5d91d52b4ab6ecacfcf7fd4212e9d9a501a52c4 (diff) | |
| parent | e6acc875a6354a8d7eec44690f07d24fac3a7c52 (diff) | |
| download | frameworks_base-34c5a6205afcbf0b6480df3a35deb1a16a3eac1b.zip frameworks_base-34c5a6205afcbf0b6480df3a35deb1a16a3eac1b.tar.gz frameworks_base-34c5a6205afcbf0b6480df3a35deb1a16a3eac1b.tar.bz2 | |
am 24a36fa3: am 336a9316: Merge "do not allow monkey to flip OEM unlock flag" into lmp-dev
* commit '24a36fa33f304e112b93d5cecbb84a80c523ef9b':
do not allow monkey to flip OEM unlock flag
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions