OSDN Git Service

am a23076db: (-s ours) am f2170644: Merge "Fix cut off charging indication in certain...
authorAdrian Roos <roosa@google.com>
Thu, 27 Aug 2015 08:50:00 +0000 (08:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 08:50:00 +0000 (08:50 +0000)
* commit 'a23076db7d48a856fca111cce485f9f36ce2b9fd':


Trivial merge