summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2014-11-26 19:42:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-26 19:42:10 +0000
commit70629916864bee1cf7a0df3fa1566efa9e7c300f (patch)
tree60155e1f060d9fae7979b1a0b55fbf25acb60ff8 /tools/aapt2/java/JavaClassGenerator_test.cpp
parente63c22242721a84259015374abd1477355098df8 (diff)
parentf19f90b229c9d15b33895988fd5e4e13d786f616 (diff)
am f19f90b2: am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev
* commit 'f19f90b229c9d15b33895988fd5e4e13d786f616': Don't let NetworkMonitor state stop user-initiated transitions.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions