diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-11-26 18:43:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 18:43:29 +0000 |
| commit | f19f90b229c9d15b33895988fd5e4e13d786f616 (patch) | |
| tree | 03631e77f913be6b92295ca34f927b5c8ca7d5b6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e4d336eb9542f59d9ab4d5bfb21ad4ce9fc5a83a (diff) | |
| parent | 58a493accfeafa13fd77a16e832c5ad72a4c9006 (diff) | |
am 58a493ac: am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev
* commit '58a493accfeafa13fd77a16e832c5ad72a4c9006':
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