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

Merge to upstream r320528.
am: 9ca0ad7a15

Change-Id: I95e6c15c01b8f081e1eb7675e1f97b109e723118