OSDN Git Service

Merge commit '8a196b5630a93a3eb6df4cbe461917731e54fb35' into merge-fix
authorMichael Wright <michaelwr@google.com>
Wed, 23 Sep 2015 16:36:41 +0000 (17:36 +0100)
committerMichael Wright <michaelwr@google.com>
Wed, 23 Sep 2015 16:36:41 +0000 (17:36 +0100)
commitcff01363fcbdae5486287540e1f8917244aaea90
tree08d0dd1d383decc4fafb855747e69a301f39758f
parent83af0cc22c77c31df1f08d65f29509b6123b6399
parent8a196b5630a93a3eb6df4cbe461917731e54fb35
Merge commit '8a196b5630a93a3eb6df4cbe461917731e54fb35' into merge-fix

Change-Id: Iae99c0f3a13d999f1ff093993008a7c720e99725