OSDN Git Service

Merge changes I0aa46d9d,I6431111b am: ee6fb66dc1
authorJosh Gao <jmgao@google.com>
Sat, 30 Apr 2016 00:55:59 +0000 (00:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 30 Apr 2016 00:55:59 +0000 (00:55 +0000)
commita18f854409a15e16b0b2b8da0eb9bedf591790f3
treeba49991edb72c277c851d685b1f9e175e543afde
parente3b535e9a76efbcb0c1c6ba36e112e272c1b046b
parentf8b63759dd035e4e235830b996d2cc028869e802
Merge changes I0aa46d9d,I6431111b am: ee6fb66dc1
am: f8b63759dd

* commit 'f8b63759dd035e4e235830b996d2cc028869e802':
  Add __INTRODUCED_IN_{32,64}.
  Add __INTRODUCED_IN hack to complex test.

Change-Id: I22ed91a7b06063632a4219f1d96eff8a08a44ce2