tree e0bb24afb2c9e5917ed217e8d7b2e01867e8a7c1
parent 901e2a634a8fce0c5e5acaa369e4e69326980b96
parent 43f694a278917f1a151b7405e901eebaf053e8f4
author Aurimas Liutikas <aurimas@google.com> 1513801655 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1513801655 +0000

Merge changes from topic "am-b8b568d6-1013-4dc3-bc71-954ceb76e5ca"

* changes:
  Merge commit 'f495e406bb2d91e4e5d2fc9f9dbbb647bfe0b996' into am-b8b568d6-1013-4dc3-bc71-954ceb76e5ca
  resolve merge conflicts of 5facdd2f77a127a01a1f2ef52b617f9996f8a45c to oc-mr1-jetpack-dev