diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:30:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:30:57 -0700 |
| commit | 7bc998501f99d57eae685522bb08c5968e072dc1 (patch) | |
| tree | b7c5eb0e064024a8005471e0019b1a0a23367a6a | |
| parent | 1bc257c99f415b9f20ef4d94be59fd7816e84252 (diff) | |
| parent | f2594a9346c5cc023cab2eb6f216b28c29411461 (diff) | |
| download | tilapia-7bc998501f99d57eae685522bb08c5968e072dc1.tar.gz | |
am f2594a93: am 512d09d3: (-s ours) am 9bffd1e9: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'f2594a9346c5cc023cab2eb6f216b28c29411461':
0 files changed, 0 insertions, 0 deletions