tree a9732098b3f5d44433ae5a63b81fb681e888305d
parent 81ee4fc47585fc6721dc26fc258c22aa3a91f926
parent 036335d2764d77a1c0001830b81631ed084aef4e
author Elliott Hughes <enh@google.com> 1533073810 -0700
committer android-build-merger <android-build-merger@google.com> 1533073810 -0700

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

Change-Id: Ieb3b9f3b543bf8d93fa616b98adb04a29ddbc768