OSDN Git Service

Merge "Fixed a bug with the collapsed media template" into nyc-dev
authorSelim Cinek <cinek@google.com>
Thu, 24 Mar 2016 16:52:20 +0000 (16:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Mar 2016 16:52:20 +0000 (16:52 +0000)
commit8af3d6a5b226bd446b5971e4d0f4aa69e01c086e
tree678580509a0f56c04fd7f5d08416bfbca8477f0c
parent65602b357e6cbc3613bccf36880781c9ded6e5b9
parent45acc156bec4dfd42e49867a710c9a5ac4278b79
Merge "Fixed a bug with the collapsed media template" into nyc-dev
am: 45acc15

* commit '45acc156bec4dfd42e49867a710c9a5ac4278b79':
  Fixed a bug with the collapsed media template