| commit | 292e62aa0d092de56c7b26e75a59beaa0f26fb4e | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:52:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:52:25 2014 +0000 |
| tree | 058e50a8a396c96bcab34d12ee1274475cdc578e | |
| parent | 54c50b59d5539ec6096f89ef72a360f55f23a6f2 [diff] | |
| parent | babc7880785ea22074bd58dbf5b5144dd33521d7 [diff] |
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 'babc7880785ea22074bd58dbf5b5144dd33521d7':