aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:40:15 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-06 12:40:15 -0800
commit7d79e5016f65b1067b4146c0c4e3ff2e6e95cf13 (patch)
treee6e4939d89a60fb561f0c8bbaed0eeb662d17cef
parentb3758ba79191a40ece0e563008f96145286fc167 (diff)
parent66d3e192ea68d266a00307b23b40a44eff8d01af (diff)
downloadpanda-7d79e5016f65b1067b4146c0c4e3ff2e6e95cf13.tar.gz
am 66d3e192: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '66d3e192ea68d266a00307b23b40a44eff8d01af':
0 files changed, 0 insertions, 0 deletions