tree 187443e135286014bd5f210e4044f073249c3866
parent 0c7ca99ff62be0b5a27eee5fa78400c875ffbdd5
parent b6f88caea3dd14a68ddb2397e94b6bd874992e24
author Android Build Merger (Role) <android-build-merger@google.com> 1469220132 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1469220133 +0000

Merge changes I916c680d,I55e7c86c into nyc-mr1-dev-plus-aosp

* changes:
  Merge \"Fix intent flags\" into nyc-mr1-dev am: 85e086248d
  Fix intent flags am: 7e5c3e8542