diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-01-10 22:12:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-10 22:12:56 +0000 |
| commit | 740df4845df9e7d9ae7f5144e0f6dc4e24cfd682 (patch) | |
| tree | dfe95d79b5315773b798c890f9663639fe6beb79 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fa4697e247f97b71fb1e0ac75edc5fa4ec5cf331 (diff) | |
| parent | c7325cd3576f7e2bc25b4c49c53d5bc5e5af9938 (diff) | |
am c7325cd3: am f94d5d26: Merge "CEC: Keep Playback device awake while it is the active source" into lmp-mr1-dev automerge: 258b941
* commit 'c7325cd3576f7e2bc25b4c49c53d5bc5e5af9938':
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