tree 313faa1acf933a504d2a90e5152bfdcd7beb7f13
parent fa331b1dfbf3e071e2ff48dbe21727452bfb8042
parent c7f7d1bf18dded61bcbf4015a4cfc9cf1ee45bd4
author Sascha Prueter <saschap@google.com> 1384846271 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384846271 -0800

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

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