tree 3e87fb93db3936874607d99b1e6bd6bc2a208688
parent b30749b60f126c5b3d288e833e98877f4307c548
parent 43adc3d4e3ac91a43fdd63814bd335410b115e8f
author Android Build Merger (Role) <android-build-merger@google.com> 1502485693 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502485693 +0000

Merge "Merge "docs:  replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65 am: 1e6401b07e" into oc-dr1-dev-plus-aosp