summaryrefslogtreecommitdiff
path: root/tools/aapt/XMLNode.cpp
diff options
context:
space:
mode:
author John Spurlock <jspurlock@google.com> 2014-09-22 19:19:35 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-09-22 19:19:35 +0000
commit453b35e2c46c1aac015e19b0965b71c4ee943542 (patch)
tree789c3e2179928dc327c94dc62f9df52ecf0d13a6 /tools/aapt/XMLNode.cpp
parentccf5d24b7ad0c2b3ef7059a0cbcfc3452e16d43e (diff)
parent76e94541898342abb5367984f90952680662a3d9 (diff)
am 797fd661: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev
* commit '797fd661e8bbe504dfb4378ac10de1181dc62f6b': Doze: Ensure a doze reset happens after leaving keyguard.
Diffstat (limited to 'tools/aapt/XMLNode.cpp')
0 files changed, 0 insertions, 0 deletions