OSDN Git Service

am e6286724: (-s ours) am e528f048: am 84a04d52: Merge "Move frameworks/base/tools...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 09:30:26 +0000 (09:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:30:26 +0000 (09:30 +0000)
commitee0d0692502312caec57e3bf590e41aebc0df530
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent84b2ebd35734ff142ed3b33a8286c4eb8efe978c
parente62867247d9386472c0b19662763c731312491cf
am e6286724: (-s ours) am e528f048: am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h."

* commit 'e62867247d9386472c0b19662763c731312491cf':