tree cf53980b7b53baac145ddd78fe0114c6324d16d1
parent 5e4d96448f418f20b1e6678b10fcdb31d51e8290
parent f347587603f947de2d46b15d0df802dcec3e6dba
author Steven Moreland <smoreland@google.com> 1480612773 +0000
committer android-build-merger <android-build-merger@google.com> 1480612773 +0000

Merge "Require storage type on enum."
am: f347587603

Change-Id: Ied16fdbc46c5e936d49b88d029ed8799a68ac10d