summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-29 11:54:58 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2012-11-29 11:54:58 -0800
commitda068042443cf968773bd9c7f2ca8e2ae8e59a05 (patch)
treeee19b6a6c4e33c4b9328265c1f2943b69c022721
parent1275cfc50b86618f925856e9727956c7d5a02584 (diff)
parent6a73c51fbf0dfacedc21614b112a1a3f26820afb (diff)
downloadextras-da068042443cf968773bd9c7f2ca8e2ae8e59a05.tar.gz
Reconcile with jb-mr1-release - do not merge
Change-Id: I6144d785b6b161bf3f84f94b5ae8a612eaf8ffca
0 files changed, 0 insertions, 0 deletions