OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a59df21 e6f2bbe)
Merge changes from topic 'am-608338568dd24535a5feb566bcc48cf7' into oc-dr1-dev-plus...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 21 Jun 2017 04:22:55 +0000 (04:22 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 21 Jun 2017 04:23:07 +0000 (04:23 +0000)
* changes:
  Merge changes from topics 'bug_62802026_take_2', 'bug_62802026' into oc-dev am: 4f7fd183eb am: 5fd9dd2e74
  Fixed how FillEventHistory is reset and clarified javadoc. am: 2e30c6f371 am: 605f633995


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help