OSDN Git Service

am aab73857: (-s ours) am 1b3a3d82: Add GN files for vendor_libs
authorArman Uguray <armansito@google.com>
Thu, 27 Aug 2015 10:55:13 +0000 (10:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:55:13 +0000 (10:55 +0000)
* commit 'aab73857903d559e0e968b7604315b254c30d7e4':


Trivial merge