tree cb36f51a63098ca2169b24b1736232f4d3544d5a
parent 79db321e2a1cab254a648d528c9ac98d719c0a87
parent 5866c04a6b152aac6dd13e9ebba9a86831a84a29
author Jorim Jaggi <jjaggi@google.com> 1430274299 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430274299 +0000

am 5866c04a: am 15ec725c: am b3a020a6: Merge "Fix build." into mnc-dev

* commit '5866c04a6b152aac6dd13e9ebba9a86831a84a29':
  Fix build.