OSDN Git Service

Merge "Card mark holding class instead of declaring class" am: 0ed44f9595
authorMathieu Chartier <mathieuc@google.com>
Tue, 9 Aug 2016 19:41:50 +0000 (19:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Aug 2016 19:41:50 +0000 (19:41 +0000)
am: c8e6f7a739

Change-Id: Id2057c84fab6acd7dd016a59217ff899430f2f84


Trivial merge