commit | e80dff290c141b751f886a5a0505f644e1826258 | [log] [tgz] |
---|---|---|
author | Michael Wright <michaelwr@google.com> | Thu Apr 14 22:35:01 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Apr 14 22:35:01 2016 +0000 |
tree | c22c056b38a8a5ecc2b6efac7c342e40054dd2a4 | |
parent | c0c22d15b200326c5529b0f4347b29b7da12ce2f [diff] | |
parent | d66a831ffc059a80e6cc7c1dc996159eb2f97eba [diff] |
Merge changes from topic \'choreo_ndk\' am: d66a831 * commit 'd66a831ffc059a80e6cc7c1dc996159eb2f97eba': Add choreographer API to the NDK Copy over libandroid symbols from platform 21. Change-Id: I0bf882917fd975d394655becf2220334a6f1a8e5