summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorOlawale Ogunwale <ogunwale@google.com>2015-04-09 01:18:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-09 01:18:01 +0000
commit792ae337758786c8efa793c3e28ecc63170e1a81 (patch)
tree7d673015d0c8802b588473ea1549c58c580cba2d /tools/aapt
parentada3e01313b3d395ee31918fb004b4afed5769be (diff)
parent33a68a521f77a2070832ece271d1047ecf56de7e (diff)
downloadframeworks_base-792ae337758786c8efa793c3e28ecc63170e1a81.zip
frameworks_base-792ae337758786c8efa793c3e28ecc63170e1a81.tar.gz
frameworks_base-792ae337758786c8efa793c3e28ecc63170e1a81.tar.bz2
am 33a68a52: am 343e291b: am e8a3c320: Merge "Prevent windows from freezing screen while timeout"
* commit '33a68a521f77a2070832ece271d1047ecf56de7e': Prevent windows from freezing screen while timeout
Diffstat (limited to 'tools/aapt')
0 files changed, 0 insertions, 0 deletions