tree 7c2167c85cf04500fe644a8b4b7b166ace933a1f
parent f3f31142c68b9bd178bd638c010e4dade8ffd19d
parent a9249322d554fa13eb9c2662d39be256f833404f
author Sascha Prueter <saschap@google.com> 1384846515 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384846515 -0800

am a9249322: am c7f7d1bf: am f7044fec: Merge "Trying to unbreak build..." into klp-dev

* commit 'a9249322d554fa13eb9c2662d39be256f833404f':
  Trying to unbreak build...