tree b8b620a235d5113dc8ea6fc8c9e93fb938678f03
parent 1756d6ad72c3ecd7639a8179d62ffcbf8f1593d6
parent 5667bad110a23d5347e43e8acc824b0a6e4f2379
author TreeHugger Robot <treehugger-gerrit@google.com> 1513667790 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1513667790 +0000

Merge changes from topic "am-3cd36979-4789-4903-b753-2c3ba65bba33"

* changes:
  [automerger] resolve merge conflicts of fbc76f93f0fe94924515a34654387c1dea5162af to oc-mr1-jetpack-dev am: 6319e4c19b
  resolve merge conflicts of fbc76f93f0fe94924515a34654387c1dea5162af to oc-mr1-jetpack-dev