diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:28:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:28:33 -0700 |
| commit | 80db0db52bcc538c519996f19068345ed33a43af (patch) | |
| tree | d5f9daedb45d28c7ae2ebe1b325d99464becab83 | |
| parent | 688b235bfbad9fcd60fbc44ef4bb2c23bb94e241 (diff) | |
| parent | 8b40761ad0efad7d428c6268e3324d0dd8101481 (diff) | |
| download | panda-80db0db52bcc538c519996f19068345ed33a43af.tar.gz | |
am 8b40761a: (-s ours) am 35cf1243: (-s ours) Reconcile with jb-mr1-release - do not mergejb-mr1.1-dev
* commit '8b40761ad0efad7d428c6268e3324d0dd8101481':
0 files changed, 0 insertions, 0 deletions