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