OSDN Git Service

Merge "Cherry-picking Id45abeba and Ia065dec6 for MR1" into ics-mr1
authorJustin Ho <justinho@google.com>
Fri, 16 Dec 2011 19:52:08 +0000 (11:52 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 16 Dec 2011 19:52:08 +0000 (11:52 -0800)

Trivial merge