| commit | 0f97cc30663d3a4f636463124c04763c509eab40 | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Tue Sep 15 13:34:35 2015 -0700 |
| committer | Dan Austin <danielaustin@google.com> | Tue Sep 15 13:34:35 2015 -0700 |
| tree | 9961125fedf0880af4e755160fc5ba2108a01b35 | |
| parent | 6cc8d71b942f509b2f96e1ba75119f97ae1b10ee [diff] | |
| parent | 27f09f91be8ea92ce69141e099e459dce4f9ea45 [diff] |
resolved conflicts for 27f09f91 to stage-aosp-master Change-Id: I4a3efc888ccb019f1d971bbc3ce7a4f090a3a97c