tree 1d592e974c6ec12dacf79904ca9c25d4e629076f
parent bcfa22584b2c42648dd326b26b3c2cde6cd678f4
parent 0580ac8a651ee97156ab3b1527c0c3021cba5e12
author Cindy Kuang <ckuang@google.com> 1502485275 +0000
committer android-build-merger <android-build-merger@google.com> 1502485275 +0000

Merge "docs:  replaced "i.e." to fix formatting error" into oc-dev
am: 0580ac8a65

Change-Id: I094bd99bcaaf51633ac887d38a9323ed5fdc54e2