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