| commit | 1ea067001d14ae1a5eb52c9e8c27a9fd9b109c78 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Mar 11 12:41:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 11 12:41:45 2013 -0700 |
| tree | 368ffdee5359be7466ce242f5441bacd55aaf2ee | |
| parent | e02247f4c53e1df4cac3a7b265ffb4307cca3650 [diff] | |
| parent | cf076e61dbf727a931a6be1cc2811d795a165f77 [diff] |
am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'cf076e61dbf727a931a6be1cc2811d795a165f77':