diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-01-10 22:04:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-10 22:04:27 +0000 |
| commit | 258b9418905de33f1b6f8461d79c8e39be7a50a5 (patch) | |
| tree | 9b3b8245ecf11ba9e3335d75306b94ec4ad0945c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | db343ecae8671eef0b945e08cf71ad6eb8a6a9e7 (diff) | |
| parent | f94d5d26f2d122cbb41327d8e34d8655514f9b0c (diff) | |
am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev
* commit 'f94d5d26f2d122cbb41327d8e34d8655514f9b0c':
CEC: Keep Playback device awake while it is the active source
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions