summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-11-19 17:57:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-19 17:57:25 +0000
commit34a2ee695d7411c6b9abd7db3fd105851092bafb (patch)
tree3e7dd16150998a3059fd55f454cdaac64539456a /tools/aapt2/java/JavaClassGenerator_test.cpp
parent88a080bc68de7590c4ee1bc69fa9dbd40f6a9055 (diff)
parent9d48ec7a5c639226f69377d41c4fcb2d3e17c13e (diff)
am 9d48ec7a: am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev
* commit '9d48ec7a5c639226f69377d41c4fcb2d3e17c13e': Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions