aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-07-31 15:05:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-31 15:05:57 -0700
commit44ec1422886bf245fe4610ce2a23ce0bc436f903 (patch)
tree17a7d0ccad81c22f59b0eb63ced847e7e394d5f6
parent315b4e7957fc7a3e73a52356b49ea20cfa6f7764 (diff)
parentd2cd0f05a2ba440d0d55cb15ca8c575b25ecb377 (diff)
downloadsource.android.com-44ec1422886bf245fe4610ce2a23ce0bc436f903.tar.gz
am d2cd0f05: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'd2cd0f05a2ba440d0d55cb15ca8c575b25ecb377':
0 files changed, 0 insertions, 0 deletions