diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-07-25 22:47:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-25 22:47:48 +0000 |
| commit | a2b355bba6088abf5665022de7e5b09ec769b0e4 (patch) | |
| tree | ac74d04634b222a8d2a6b6bc3edd56186bae1a0a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b43041a8e9fff4eee9204c67566ed5db31c63449 (diff) | |
| parent | a3b7b7f8c70e2e23f30dd7e811cf3bf493d88fc4 (diff) | |
Merge changes I39b8c6a5,I6a15fdea,I459d3e01 into nyc-mr1-dev-plus-aosp
* changes:
Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev am: 52a11f7c64
Fixes a bug where the lockscreen would be frozen am: 3127daf036
Allow home button to be tapped while a incoming call shows a HUN am: 64be772e03
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions