summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-23 08:10:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-23 08:10:23 -0700
commit1c1593079433e696348195c9e3e7dc1176acc0bb (patch)
tree4cfe5005fae8708b93ac9f8b64e92f2ee81f9d51
parent17775724b89e942b06c67144317697924039ad99 (diff)
parent54d19aa66c6d446c97172599a9317caa6c456741 (diff)
downloadsystem_core-1c1593079433e696348195c9e3e7dc1176acc0bb.zip
system_core-1c1593079433e696348195c9e3e7dc1176acc0bb.tar.gz
system_core-1c1593079433e696348195c9e3e7dc1176acc0bb.tar.bz2
am 54d19aa6: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '54d19aa66c6d446c97172599a9317caa6c456741':
0 files changed, 0 insertions, 0 deletions