OSDN Git Service

Merge "JB MR2 == API 18." into jb-mr2-dev
authorDianne Hackborn <hackbod@google.com>
Mon, 22 Apr 2013 23:37:37 +0000 (23:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 22 Apr 2013 23:37:37 +0000 (23:37 +0000)

Trivial merge