tree 9d71f65d5f2a511a28fc44a6b01d635cc7735ba7
parent b1a4e00a8e705f5eda6175948bb93674ee7215c3
parent 1b59010c3dd38d4dd0c16c043b97761d99c16ae9
author Elliott Hughes <enh@google.com> 1533074315 -0700
committer android-build-merger <android-build-merger@google.com> 1533074315 -0700

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

Change-Id: I7ae5813e0d08402eb24caf0565e052681e549611