diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-10-03 15:25:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-03 15:25:14 -0700 |
| commit | 1205123e40fa563ba42c953294a291bba3f62820 (patch) | |
| tree | a3225f860018fe2e45fb74efab5605ab00eeb65f | |
| parent | 7d4be2d28260b49acf5516f6a930144c9be3c5da (diff) | |
| parent | 4e8ba13e1ba1a8876b254def2c889b507332b608 (diff) | |
| download | toroplus-1205123e40fa563ba42c953294a291bba3f62820.tar.gz | |
am 4e8ba13e: (-s ours) Reconcile with jb-dev - do not merge
* commit '4e8ba13e1ba1a8876b254def2c889b507332b608':
0 files changed, 0 insertions, 0 deletions