tree f0f6ef588dec7b538ae8efe0968c5288c45541e6
parent ef8e455e2050caf9ee2e8d018024c9e13c029849
parent c69ff83feb6f6b0ebc0f4997a84cadc14bdd4488
author Deepanshu Gupta <deepanshu@google.com> 1420584272 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420584272 +0000

am c69ff83f: resolved conflicts for merge of 748fb34d to lmp-mr1-dev

* commit 'c69ff83feb6f6b0ebc0f4997a84cadc14bdd4488':
  Update SDK Pkg revision for API 21 to 3 [DO NOT MERGE]