OSDN Git Service

am de5cc883: am f57b5e6f: am 4a56983f: am d193916c: Merge "Fix build." into mnc-dev
authorDianne Hackborn <hackbod@google.com>
Wed, 15 Jul 2015 23:17:00 +0000 (23:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Jul 2015 23:17:00 +0000 (23:17 +0000)
commit4de824e2bb6d7cf7c4129bbc9a4fe988ddc96192
tree646bf2bf9eb9a9af90ab0331ebdda554ce7d994a
parent209c8cedab87359564c032a3e56b3acd452e1ac9
parentde5cc88306cccdfe998ffafed4830b5db45b2ffd
am de5cc883: am f57b5e6f: am 4a56983f: am d193916c: Merge "Fix build." into mnc-dev

* commit 'de5cc88306cccdfe998ffafed4830b5db45b2ffd':
  Fix build.