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