OSDN Git Service

am c6805c7f: (-s ours) am 252c76a8: am 22b0d455: am 2d5c7478: Don\'t load data when...
authorAngus Kong <shkong@google.com>
Wed, 30 Apr 2014 18:14:48 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:48 +0000 (18:14 +0000)
* commit 'c6805c7f7a3817980b297b5c8b5ece315a12874a':


Trivial merge