summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-03-11 12:47:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-11 12:47:15 -0700
commitf9ad69f467c2207e6e8ec995c2b73dde0f6a787f (patch)
tree1accede5e43bb6ad38058079de2f839ad5bd22f3
parent917e120f736f95292a40b6c7da9940d6369955e1 (diff)
parent803b245ef485f16245234a42b8885a2ec50c5e5a (diff)
downloadextras-jb-mr1.1-dev.tar.gz
am 803b245e: (-s ours) am 469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not mergejb-mr1.1-dev
* commit '803b245ef485f16245234a42b8885a2ec50c5e5a':
0 files changed, 0 insertions, 0 deletions