aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:22:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-06 12:22:46 -0800
commitb2a7de12dfc0d623ca45199c7362c68070fb21eb (patch)
treee6e4939d89a60fb561f0c8bbaed0eeb662d17cef
parent42dcf49fc9f344d2b813a9df69feb7107d55b7cd (diff)
parent688b235bfbad9fcd60fbc44ef4bb2c23bb94e241 (diff)
downloadpanda-b2a7de12dfc0d623ca45199c7362c68070fb21eb.tar.gz
am 688b235b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '688b235bfbad9fcd60fbc44ef4bb2c23bb94e241':
0 files changed, 0 insertions, 0 deletions