summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-07-11 10:17:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-11 10:17:25 -0700
commit1c0e7a9cb2ca53c662e853421d7fa08ca5ad8538 (patch)
treeeffa22031f55a3260979ca2776a36e59c55fc634
parentcf5dd91ec796abad8f6464687439c47f5a86f3df (diff)
parent1bb59258458350af518170558120783bc2f9e61d (diff)
downloadframeworks_av-1c0e7a9cb2ca53c662e853421d7fa08ca5ad8538.zip
frameworks_av-1c0e7a9cb2ca53c662e853421d7fa08ca5ad8538.tar.gz
frameworks_av-1c0e7a9cb2ca53c662e853421d7fa08ca5ad8538.tar.bz2
am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '1bb59258458350af518170558120783bc2f9e61d':
0 files changed, 0 insertions, 0 deletions