diff options
| author | Bryce Lee <brycelee@google.com> | 2015-02-06 19:09:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 19:09:28 +0000 |
| commit | 7b5f9cde6ac6d949d0227eb47aa2c5de4aea71d9 (patch) | |
| tree | 63480927c37d495a968404204084d6f1b508fc73 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c63efbd928cc14e32fe19b2dec41d15ffc584182 (diff) | |
| parent | 4cccd58e4219ff1e974db201e064c85063dd262f (diff) | |
am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev
* commit '4cccd58e4219ff1e974db201e064c85063dd262f':
Expose userActivityTimeout through @SystemApi getter/setter.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions