| commit | 192f14db57d0e4eedf9236659cdb1e1df6a48481 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue Jan 06 22:57:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 06 22:57:04 2015 +0000 |
| tree | 2b204d11f7e9618b969f0e4c86e9d27aced50164 | |
| parent | f02769d6ba2b06ee6be80315f39b43679e9e905f [diff] | |
| parent | 2aa06dbe20ebfbd837e7a672efcb441cf736654c [diff] |
am 2aa06dbe: am c69ff83f: resolved conflicts for merge of 748fb34d to lmp-mr1-dev * commit '2aa06dbe20ebfbd837e7a672efcb441cf736654c': Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]