OSDN Git Service

Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537...
authorJeff Sharkey <jsharkey@android.com>
Fri, 16 Sep 2016 23:40:13 +0000 (23:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Sep 2016 23:40:13 +0000 (23:40 +0000)
commit33ada2e9272024e549373ddae586cfaf01596d27
tree67dee478c2a909a39da2833c64c8c58b691150ab
parentc9cf811b5086eda891997c6ce6615dcd6b571c51
parentfc1c0f9dff983399fa41fad59c3356ed9646412d
Merge commit '0a9d537f623b2c11dce707fb9b91fea016fd0e9f' into manual_merge_0a9d537 am: df42d732f8 am: afcd1135c3
am: fc1c0f9dff

Change-Id: I4c197be781f981af568ae98e1c3358ce8572e39a