tree 5afb14ca9f752d7cffa8e6ffffafd44bd8587de3
parent b911a90123ed3d1bf754d326e8554ac7438129c7
parent 975e54d36619e4eb32391b56a1914dccbf098a9d
author Tor Norbye <tnorbye@google.com> 1474408050 +0000
committer android-build-merger <android-build-merger@google.com> 1474408050 +0000

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

Change-Id: I88a834e7387c03043a0571ba545a2c5c9fd320a3