tree f753308f6fbc8244d10354ad8e8b9b26afcace28
parent febecb821865a03585ac1d752c4f1a3de094581c
parent 4c4fb3bdfb405908db3a70fb2b63a1bc52564062
author Hall Liu <hallliu@google.com> 1505440470 +0000
committer android-build-merger <android-build-merger@google.com> 1505440470 +0000

Merge "API council suggested edits, part 3" am: 7a4cc05d45
am: 4c4fb3bdfb

Change-Id: Ifc0a36557d8a5a1a7d19e00550ae2a1997db800f