summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-10-02 09:24:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-02 09:24:41 -0700
commit51caf4d4f4c682d16befe1aee8344abdeb52da0f (patch)
tree1fec4897f43973c7eeed36a3a7e466058638e94f
parent76eedf59616298c7fd48737155b8671692822bbe (diff)
parentd6fdf150afc09d21fe9400bc9b010d7638de6fc5 (diff)
downloadmisc-51caf4d4f4c682d16befe1aee8344abdeb52da0f.tar.gz
am d6fdf150: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'd6fdf150afc09d21fe9400bc9b010d7638de6fc5':
0 files changed, 0 insertions, 0 deletions