tree bffa814837d1611836dbe1e149dd9791c2e3be75
parent c3cd05f8a45ab789aae1cb553df86f94667d595a
parent a849f1e4309e7624bdb3da7b443907cfd829a82e
author Kenny Root <kroot@google.com> 1454324960 +0000
committer android-build-merger <android-build-merger@google.com> 1454324960 +0000

Merge changes from topic \'sni\' am: c76789d35a
am: a849f1e430

* commit 'a849f1e4309e7624bdb3da7b443907cfd829a82e':
  Track libcore change
  Track libcore change