OSDN Git Service

am 4f53da9a: (-s ours) am ebf2ade8: Merge branch \'stage-aosp-master\' of https:...
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 04:09:19 +0000 (04:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 04:09:19 +0000 (04:09 +0000)
commit858ba4aeff15a5aba65398e2f16c5b6d3e80b755
tree691f879c01823127858bf4d07d9bd849f6e4d827
parent536504e1eba96962d11914a77cf9ef54113a8f85
parent4f53da9aaeadf83a7a8ca6373335184a06939e71
am 4f53da9a: (-s ours) am ebf2ade8: Merge branch \'stage-aosp-master\' of https://googleplex-android.googlesource.com/_direct/platform/art into stage-aosp-master

* commit '4f53da9aaeadf83a7a8ca6373335184a06939e71':