| commit | 54c50b59d5539ec6096f89ef72a360f55f23a6f2 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Fri Jul 18 22:48:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 18 22:48:49 2014 +0000 |
| tree | 058e50a8a396c96bcab34d12ee1274475cdc578e | |
| parent | a20f555a255918ac0c6a366352dece8732232eb8 [diff] | |
| parent | d67beb9aa9dfd4db1b12bcf932492acac221df04 [diff] |
am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs * commit 'd67beb9aa9dfd4db1b12bcf932492acac221df04': Update platform SDK component to revision 5. [DO NOT MERGE]