diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:22:40 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:22:40 -0700 |
commit | f2594a9346c5cc023cab2eb6f216b28c29411461 (patch) | |
tree | 68b4da9e56f1e40f17ee83d225dbd631a2043f56 | |
parent | 71ad7914aef61b7fd7785fd7db4a4e09a2be787f (diff) | |
parent | 512d09d3ecfafc0d52055612a3536e8b20a7df93 (diff) | |
download | tilapia-jb-mr1.1-dev.tar.gz |
am 512d09d3: (-s ours) am 9bffd1e9: (-s ours) Reconcile with jb-mr1-release - do not mergejb-mr1.1-dev
* commit '512d09d3ecfafc0d52055612a3536e8b20a7df93':
0 files changed, 0 insertions, 0 deletions