tree 9015cdf92a7ed8a1276e53c7735de041a5e8e1d6
parent 11416fc82da09abb7b2743a09091e0b2425e05b0
parent 94d1dc587264b19b93b52d560023aafd85dfa13b
author Ying Wang <wangying@google.com> 1352228604 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352228604 -0800

am 94d1dc58: am bfb25615: (-s ours) [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release

* commit '94d1dc587264b19b93b52d560023aafd85dfa13b':
  [DO NOT MERGE]Drop current SDK as of JOP36 #524024 from jb-mr1-release