tree 1a34e122c06a93d9fef1bbf3844d8380fce26fe2
parent 4296209de579b97accfce90b3972c8df7a93a911
parent c2fa99edf1591eca47ad678889cfd4924f2470a8
author Jeff Sharkey <jsharkey@google.com> 1443644856 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443644856 +0000

am c2fa99ed: am 792a9cc3: am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev

* commit 'c2fa99edf1591eca47ad678889cfd4924f2470a8':
  Relax auto-launch checks for GET_CONTENT.