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