tree d184480f7e32e78ca99970d7edfef52e12317410
parent 644678f99b4c0b00addbed165e35bf1b51b96fc7
parent a6131422fd68ccfced1a055c8e1d84e3cb500710
author Deepanshu Gupta <deepanshu@google.com> 1405730487 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405730487 +0000

am a6131422: (-s ours) am 82b828e1: Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev

* commit 'a6131422fd68ccfced1a055c8e1d84e3cb500710':
  Update platform SDK component to revision 2. [DO NOT MERGE]