OSDN Git Service

merge in master-release history after reset to 55638cb6c6730104ec04287e7566eae7f3e57385
authorThe Android Automerger <android-build@google.com>
Mon, 12 May 2014 12:50:03 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 12 May 2014 12:50:03 +0000 (05:50 -0700)

Trivial merge