tree cc680ee82bb91355611c99fb41b4aecc74ad5892
parent 9d5009e7930d78a5ba62f0cb99ab2a4fce87f59a
parent beb1f177ef15a3a22414144bb9d06ad421746d3c
author William Harmon <xlythe@google.com> 1465316137 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1465316138 +0000

Merge "Bug: 28875393 Bug: 28879732" into nyc-mr1-dev