summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:24:38 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-06 12:24:38 -0800
commit33cf49b168a88a88167c46b01787a57b49cd875f (patch)
tree9cb42c78836745884fb27d823740fd26972db1f3
parent3b31d805517c0bde8a0ebed219cbd4b8409c71c2 (diff)
parent78b012f5bc05706d1ce412811ccfaa9385dae0ab (diff)
am 78b012f5: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '78b012f5bc05706d1ce412811ccfaa9385dae0ab':
0 files changed, 0 insertions, 0 deletions