summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2016-01-07 18:21:04 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-07 18:21:04 +0000
commitd20aebb3217c1e56f8bf6a3c88ce0dfcf3d58a56 (patch)
tree630d65027f32f5cc0920a67bc1bec2266c16e795 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent0e734165bb6a814022c9b9f17a32a3210ecc91a1 (diff)
parent2c8f42d73005507bcd4d169fc42e844ee0a16521 (diff)
Merge "DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm." into mnc-dr1.5-dev am: c2ec3f1bbe am: f61708617c
am: 2c8f42d730 -s ours * commit '2c8f42d73005507bcd4d169fc42e844ee0a16521': DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions