tree 733a6b190f001b9001b33d078e01b677a8c03054
parent f7d759c9e430e4583203c15d39ebd9b148f39f36
parent d8e7c5f1246f3094772b7630d7df2b0554261c53
author Ficus Kirkpatrick <ficus@android.com> 1424044610 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424044610 +0000

am d8e7c5f1: am 0e43fe88: Merge "Help Robolectric find AndroidManifest.xml"

* commit 'd8e7c5f1246f3094772b7630d7df2b0554261c53':
  Help Robolectric find AndroidManifest.xml