| commit | 7b9c13b5dcac9c3e800ab2feea323a20b8bc10b2 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:57:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:57:25 2014 +0000 |
| tree | 663e9b0a8b15c3f0bdcaef98abf1121c25d91027 | |
| parent | ae75543ce01ab673951516c8dbf313233a8c946a [diff] | |
| parent | 292e62aa0d092de56c7b26e75a59beaa0f26fb4e [diff] |
am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs * commit '292e62aa0d092de56c7b26e75a59beaa0f26fb4e':