tree 15b669adc1309fa112a8e0f5789caa2bf79e6e9d
parent 2a8429a879c42cf0361d65bd29e86965c305d34b
parent 51fb1113f80d04be9775ab7f9953055e4b7d636b
author Eric Laurent <elaurent@google.com> 1389834684 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389834684 -0800

am 51fb1113: (-s ours) am 0f7eb7ee: fix the build.

* commit '51fb1113f80d04be9775ab7f9953055e4b7d636b':
  fix the build.