tree 7ff375576d53aeb0d4aafcb1f5e86c9f38706275
parent b0c0035d25ede8e0631c24095c3e29d1180c5994
parent 56fc4104b9aabd6cedd77203f93d3c190350855e
author Shuo Qian <shuoq@google.com> 1490376627 +0000
committer android-build-merger <android-build-merger@google.com> 1490376627 +0000

Merge "Remove GENERIC_FAILURE and INVALID_ARGUMENT for Api documentation" am: 2d0b636b29 am: 0efe019342
am: 56fc4104b9

Change-Id: Ia37f47663ce7932c9d294512b7af011849e27c97