diff options
| author | Selim Cinek <cinek@google.com> | 2016-07-25 18:49:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-25 18:49:49 +0000 |
| commit | 52a11f7c64b6e3f94d4a2c35e3ee254a84b2a9f1 (patch) | |
| tree | 784fb59b868fb7e0b5f3603357d4435da89a6359 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 5c6f5afd1986a807c746d2206e2428290c8e1955 (diff) | |
| parent | 3127daf036337e047746f4b6bca56cc5ae18259c (diff) | |
Merge changes from topic 'home-button-lock-nyc-mr1-dev' into nyc-mr1-dev
* changes:
Fixes a bug where the lockscreen would be frozen
Allow home button to be tapped while a incoming call shows a HUN
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions