| commit | 031af4d5004972331828fdf75e8e1f3fa79d20dd | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 09:58:48 2015 -0700 |
| committer | Dan Austin <danielaustin@google.com> | Wed Sep 16 09:58:48 2015 -0700 |
| tree | 8569a7f102041ad2a5acbff0ab8fd657f2e3471b | |
| parent | 9d46697e3bd1af0f7150703a0b6b3ab17fa630c3 [diff] | |
| parent | b6c719ecdde855a3de1dd8efb63916c3b51ebd34 [diff] |
resolved conflicts for b6c719ec to stage-aosp-master Change-Id: Ia6a7719a637bbe84bd3320a2ab997e5651e552fd