tree 15bf4b8e4130e8a74db070eaac2ec490c2c90d76
parent f9c288995d22117ff023b7e7e9417c04cc2563e2
parent 870c3553f15d9d085bb30b063563143c2fd09322
author Narayan Kamath <narayan@google.com> 1412200964 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412200964 +0000

am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev

* commit '870c3553f15d9d085bb30b063563143c2fd09322':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS