tree 3354f2c508126ef4a9316d72b4e8224fa2dd189a
parent 4033c5e1b77097c28733c1ead3b08c2fc4f5d082
parent 11d331a2af332e2022046f6a2361f6516d20076f
author John Reck <jreck@google.com> 1501718808 +0000
committer android-build-merger <android-build-merger@google.com> 1501718808 +0000

Merge "Fix compile issue" am: 27b56eb03f am: 60c65f1a67
am: 11d331a2af

Change-Id: I6f293b65cfc734beeafc510baa7121945de208e4