OSDN Git Service

am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge...
authorDavid Friedman <dmail@google.com>
Tue, 18 Aug 2015 05:07:15 +0000 (05:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2015 05:07:15 +0000 (05:07 +0000)
commit878acada08c49214b720fdd57b8150407a4e223f
tree90a92fc24d0864af1dec8c814a3a63d7a09dbd55
parentd29dd0c98633e274499ec4177e48a62644175912
parentd7792759e703200c833736df276915958588cad4
am d7792759: am 5f89ce64: am 3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev

* commit 'd7792759e703200c833736df276915958588cad4':
  Docs: Fixing files that didn't merge properly from mnc-preview-docs