summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2013-03-11 12:41:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-11 12:41:46 -0700
commit63e89c4987503a86a7a771e4b27b966e40c546e8 (patch)
tree0897f3403e18edc2efa3bb26ca19b551aa33effe
parent0e52fd6f867cb9b6a612ef224423a18b34d577f4 (diff)
parent17f9bee47164d263a037a66a406dc92c25105f4d (diff)
downloadtesting-jb-mr1.1-dev.tar.gz
am 17f9bee4: (-s ours) am 58af0551: (-s ours) Reconcile with jb-mr1-release - do not mergejb-mr1.1-dev
* commit '17f9bee47164d263a037a66a406dc92c25105f4d':
0 files changed, 0 insertions, 0 deletions