tree 5cf25d35e15148cd5b20431073f6c75e0f137522
parent 4deeaf11d7d647139ab668d3345cafa6c82d764c
parent c0e62845e476a6ffdbccc3e23965062dc513ffcb
author Android Build Merger (Role) <android-build-merger@google.com> 1462537092 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462537093 +0000

Merge "Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev am: ddfb09b5af am: 55c30b2d7f" into nyc-mr1-dev-plus-aosp