| commit | cc503471b9ca78d86ad8a53cb271361276190fee | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Thu Sep 17 11:17:42 2015 -0700 |
| committer | Dan Austin <danielaustin@google.com> | Thu Sep 17 11:17:42 2015 -0700 |
| tree | 67f11fc358cde2a825449de9eb9abd49500d6ec1 | |
| parent | a90a8a3411fd4e251fda780b1549525e43fb9643 [diff] | |
| parent | 619e79a2655e61f8755ff6db8a89ca5281f61649 [diff] |
resolved conflicts for 619e79a2 to stage-aosp-master Change-Id: I74c0f17059db87fbd8b83e7f82e42b6ff76e7b9d