OSDN Git Service

am ee0d0692: am e6286724: (-s ours) am e528f048: am 84a04d52: Merge "Move frameworks...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 19:00:20 +0000 (19:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 19:00:20 +0000 (19:00 +0000)
commit16855594e243be2a3c6d082e98d1d3077ebf5e8c
treedac0c3e7fb56a41aecac39e4e0713ea791d15008
parentd990db0f1729b3e202e8ec2838ffbce78c041011
parentee0d0692502312caec57e3bf590e41aebc0df530
am ee0d0692: am e6286724: (-s ours) am e528f048: am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h."

* commit 'ee0d0692502312caec57e3bf590e41aebc0df530':