OSDN Git Service

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)
commitc6e3a65dff3e7dc92677f64da2a28563967fc966
tree8def158d3918e4c324a7e4756b60cdc1dda27994
parenta59df21efecba9dc04c70be8bb95fb789146790e
parente6f2bbe9ad9b95f7d71d8981237f4a63f301a5b5
Merge changes from topic 'am-608338568dd24535a5feb566bcc48cf7' into oc-dr1-dev-plus-aosp

* 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