OSDN Git Service

am 8f4787e6: (-s ours) am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
authorLorenzo Colitti <lorenzo@google.com>
Thu, 27 Aug 2015 09:14:11 +0000 (09:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 09:14:11 +0000 (09:14 +0000)
commit6bb99805ea47ffef50d68d15c1b13bb4ae76b696
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent3e98030605c9e6dcb06a8d0edf1a968423e5a806
parent8f4787e615c483081c7c4844b0f81c0e0d8dfca8
am 8f4787e6: (-s ours) am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev

* commit '8f4787e615c483081c7c4844b0f81c0e0d8dfca8':