tree d1846b037ba06ce7fddc8446aeac680cf82b51c0
parent 8eb95bd73a80b82d5071ff5e6d857639ca0bac71
parent b92b9a89cb75cbbda26b53ca44b37354b51aca96
author Dan Albert <danalbert@google.com> 1513209739 +0000
committer android-build-merger <android-build-merger@google.com> 1513209739 +0000

Merge to upstream r320528. am: 9ca0ad7a15
am: b92b9a89cb

Change-Id: I3ffbbaf9541d6ab18f7711e42fe275028282b304