tree 37932726202509e976c266b5e8c4f995f4a536c1
parent 92b1895ef9aec0ce0ea82ccc4d6ae1bebd5d1b74
parent 18301e01a3aab9e9c7b1df01199439a11b926989
author Tor Norbye <tnorbye@google.com> 1474410234 +0000
committer android-build-merger <android-build-merger@google.com> 1474410234 +0000

Merge "Add metadata for the dimension annotation, and strip typedefs" into nyc-mr1-dev am: 975e54d366 am: fa167ff4dc
am: 18301e01a3

Change-Id: I50f62ed18d78ba3cb35185359e9e484c320afa34