tree 9d09dd7bb39691b7809a622fcb149dc8fb8231d2
parent 0d376a1da9b307c4cac6f0eb4dde87599b3393d5
parent f58f56d19128e877c53af771d3ca50acf8b652ed
author Elliott Hughes <enh@google.com> 1533074063 -0700
committer android-build-merger <android-build-merger@google.com> 1533074063 -0700

Merge "Fix ASharedMemory doxygen formatting, add availability." am: 519485d161 am: 036335d276
am: f58f56d191

Change-Id: I6f5a31cde0f3f91fcb99d416c1658c1a551d484f