OSDN Git Service

am df45e1b2: (-s ours) am e836a229: Fix build.
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 27 Aug 2015 09:44:29 +0000 (09:44 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:44:29 +0000 (09:44 +0000)
commit34fbe1015501bb90478b45f3d87884a83c2533db
tree715d547d2502de8d04de0ec12233b3183ce62c99
parentb4fa38492f9d5f5aedca8905826eee9ed07eade7
parentdf45e1b27d8eeeece9f95b6d80dab059297d1a60
am df45e1b2: (-s ours) am e836a229: Fix build.

* commit 'df45e1b27d8eeeece9f95b6d80dab059297d1a60':