tree c9a052b576ae40c2d98bf63da847186f82496422
parent 9f3743beeeda733ceb34cf72761dec7a37375f5e
parent 50fcac9f8629f6b02408c787e46ff4119698cc01
author Scott Kennedy <skennedy@google.com> 1413575268 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413575268 +0000

am 50fcac9f: (-s ours) am e7ebf99c: (-s ours) Add an <application> tag to the manifest DO NOT MERGE

* commit '50fcac9f8629f6b02408c787e46ff4119698cc01':
  Add an <application> tag to the manifest DO NOT MERGE