OSDN Git Service

Merge "Enable History API. Do not merge." into ics-mr1
authorBart Sears <bsears@google.com>
Wed, 4 Jan 2012 21:47:26 +0000 (13:47 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 4 Jan 2012 21:47:26 +0000 (13:47 -0800)

Trivial merge