summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2014-10-27 04:19:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-27 04:19:54 +0000
commit4fb9b753b545c7071432247686d947e5388e904f (patch)
tree89e6b91950d3cebc892c33226435dec03645647f /packages/SystemUI
parent2eef7ef099b20f4c9ebc6b3cc37b1566fec96a89 (diff)
parent69e61b5a5be11f9adab3bdab4bfe1cc0c4c95c0f (diff)
downloadframeworks_base-4fb9b753b545c7071432247686d947e5388e904f.zip
frameworks_base-4fb9b753b545c7071432247686d947e5388e904f.tar.gz
frameworks_base-4fb9b753b545c7071432247686d947e5388e904f.tar.bz2
am 69e61b5a: (-s ours) am 5a71f832: (-s ours) Merge lmp-dev-plus-aosp-without-vendor into stage-aosp-master
* commit '69e61b5a5be11f9adab3bdab4bfe1cc0c4c95c0f':
Diffstat (limited to 'packages/SystemUI')
0 files changed, 0 insertions, 0 deletions