OSDN Git Service

am 94cb7ef3: am 2df124b8: Merge "Fix build" into mnc-dev
authorChris Craik <ccraik@google.com>
Thu, 28 May 2015 23:29:52 +0000 (23:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 23:29:52 +0000 (23:29 +0000)
commitaa932c1ea0a5a06647bb1197de7573bf7662cb0f
tree97f07952a56cb3fe648962311b0b35079f9390dc
parent51d2185db2dd4d1a80156dc434165f275e61d8f3
parent94cb7ef35046c9dc9d94a3bfff18f695d635a308
am 94cb7ef3: am 2df124b8: Merge "Fix build" into mnc-dev

* commit '94cb7ef35046c9dc9d94a3bfff18f695d635a308':
  Fix build