summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-08 15:56:07 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-08 15:56:07 -0800
commit0f0f2d8ab49f10bdd4f4ebb246d7cb15f721003c (patch)
tree27060d5bc89e8b14d133f3c6616236088da4149b
parentd6a6c7f25f630b97f0388d031bf97e2ea1a642a1 (diff)
parent122dbe96d89e8d5439cf41b92ac8b0ec435f331e (diff)
am 122dbe96: (-s ours) am cc16a7ef: am 75993947: Reconcile with jb-mr1-release - do not merge
* commit '122dbe96d89e8d5439cf41b92ac8b0ec435f331e':
0 files changed, 0 insertions, 0 deletions