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