OSDN Git Service

am 1d1fae81: am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 01:55:42 +0000 (01:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 01:55:42 +0000 (01:55 +0000)
commit6812e0b2d0136687d27b4dfc85cf486e24c5f454
treefcb08e17206847b7e6d17c7dcc44af644be66ab4
parent97c50cfeefa45dc9357045de71d3dff745b2df33
parent1d1fae8141e3dd6a6e00d12a470fa318945465ce
am 1d1fae81: am 8cafc782: am 13670bc6: (-s ours) am 669e4969: am 3e875dbb: Fix import order. [DO NOT MERGE]

* commit '1d1fae8141e3dd6a6e00d12a470fa318945465ce':
  Fix import order. [DO NOT MERGE]