OSDN Git Service

am 2a96a389: am cf3580b0: Merge "Fix build." into lmp-dev
authorDianne Hackborn <hackbod@google.com>
Thu, 17 Jul 2014 17:05:39 +0000 (17:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Jul 2014 17:05:39 +0000 (17:05 +0000)
commit6f42914642159072e0555b4e10ea7fbfeb306f83
treeaf7f5dbfcc7a9237f1f2c4d1fec0d1b7b303a584
parenta9b8a06813512b26082c44f40e4b1d8422bbca83
parentcee665dd893208ab8efceda0fd487bf2a4742e5a
am 2a96a389: am cf3580b0: Merge "Fix build." into lmp-dev

* commit '2a96a3890975a991cbd91e9444325b0ee879caae':
  Fix build.