OSDN Git Service

am 803a6f39: am 829b79f6: Merge "Fix build." into lmp-dev
authorDianne Hackborn <hackbod@google.com>
Wed, 10 Sep 2014 01:04:22 +0000 (01:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Sep 2014 01:04:22 +0000 (01:04 +0000)
* commit '803a6f399a2e0bfac8beb5d7ac2425dd3d9bdc46':
  Fix build.


Trivial merge