summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorWilliam Bourke <billbourke@google.com>2014-10-17 22:20:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-17 22:20:44 +0000
commit83c97babb00b4b78747d5b14be2ed7dba6f438b0 (patch)
tree22a8b207d70aed6fe8b79a223a2c5e8a9f898597 /tools/aapt
parent109d4b0f2d805f105cbb2fdeb3808d6fa122a546 (diff)
parentcb1e32ac2b5eb12ff89af5eb8074908b5f54d047 (diff)
downloadframeworks_base-83c97babb00b4b78747d5b14be2ed7dba6f438b0.zip
frameworks_base-83c97babb00b4b78747d5b14be2ed7dba6f438b0.tar.gz
frameworks_base-83c97babb00b4b78747d5b14be2ed7dba6f438b0.tar.bz2
am cb1e32ac: am 44d51545: am 7d5c68e3: am 84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
* commit 'cb1e32ac2b5eb12ff89af5eb8074908b5f54d047': Modified lollipop Easter egg for TV compatibility
Diffstat (limited to 'tools/aapt')
0 files changed, 0 insertions, 0 deletions