OSDN Git Service

Merge changes I0aa46d9d,I6431111b
authorJosh Gao <jmgao@google.com>
Sat, 30 Apr 2016 00:53:46 +0000 (00:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 30 Apr 2016 00:53:46 +0000 (00:53 +0000)
commitf8b63759dd035e4e235830b996d2cc028869e802
tree55a3846f4819a2190c886d7004d872ac71c6ebac
parent5a9efce22dacab89453be3722e73d9781ca2b40d
parentee6fb66dc1a180ce0206a5ea0522000cfcf4c8b1
Merge changes I0aa46d9d,I6431111b
am: ee6fb66dc1

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

Change-Id: I8ea14d0e6897d0bbfc8bee77fc6f4cc7786c90db