tree 87b4ac056445e853f601018b6edded02500a80ae
parent 90111ad9adfc657eb140f370c1997e3b35d5968b
parent e2290bdb2641531bb94aa16601092827bdf1b907
author Linux Build Service Account <lnxbuild@localhost> 1541050572 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1541050572 -0700

Merge changes I1944666e,I30c789e0 into msm-4.9

* changes:
  Merge android-4.9.116 (52be322) into msm-4.9
  Merge android-4.9.115 (e6f9a8a) into msm-4.9