OSDN Git Service

resolve merge conflicts of 0f97b8f to nyc-mr1-dev
authorChris Wren <cwren@android.com>
Fri, 27 May 2016 02:39:20 +0000 (02:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 27 May 2016 02:39:20 +0000 (02:39 +0000)
commit12f027026ef2e32eda5e6c9105fac3896e6503c6
tree8544f4a407f60ffa43f92541ed2a9815d8c0d103
parent0ebf3cc47c9d20613f02ca263a2394d80455a09a
parent5b3b72e7b7a926ac954db23c2ceaf10aa9b32539
resolve merge conflicts of 0f97b8f to nyc-mr1-dev
am: 5b3b72e7b7

* commit '5b3b72e7b7a926ac954db23c2ceaf10aa9b32539':
  add metrics for notification and group expansion

Change-Id: I2df2f6e2ba27e4368162ce0642c77ec0a559620e