tree 8fa1922c06b7b60b743665c545994c03a376b651
parent b7deb2ee49411f927198acc88fc97e329d953f59
parent bd503d67f403ca1e1d33226626c494d5513701e4
author Colin Cross <ccross@android.com> 1481137255 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1481137255 +0000

Merge changes Ia60d7b99,I303a906c

* changes:
  Merge remote-tracking branch 'aosp/upstream-master' into master
  Merge commit 'bbc9221' into master