tree 450ffa38d75d965a1323ebecc88faebea37ba119
parent 93a9f4eca6327ff25d62de090dd970e81e554a3d
parent b249fdd553dbe82a85917b1520ad5e3a59b01d17
author Neil Fuller <nfuller@google.com> 1410265943 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410265943 +0000

am b249fdd5: Merge "Removing differences between AOSP and internal" into lmp-dev

* commit 'b249fdd553dbe82a85917b1520ad5e3a59b01d17':
  Removing differences between AOSP and internal