OSDN Git Service

Merge changes I916c680d,I55e7c86c into nyc-mr1-dev-plus-aosp
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 22 Jul 2016 20:42:12 +0000 (20:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Jul 2016 20:42:13 +0000 (20:42 +0000)
commitba838fd7c98f20cb866e9a0204fd6752d17bfe54
tree187443e135286014bd5f210e4044f073249c3866
parent0c7ca99ff62be0b5a27eee5fa78400c875ffbdd5
parentb6f88caea3dd14a68ddb2397e94b6bd874992e24
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