| commit | ba2355c9810ad3113e0705d106b28d9cdcbee759 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Wed Sep 30 22:32:05 2015 -0700 |
| committer | Stephen Hines <srhines@google.com> | Wed Sep 30 22:32:05 2015 -0700 |
| tree | 837b6f7cb749d202dbf259bbd3f0812062ca8d2a | |
| parent | ce9635ec7ad6bcc6b9bc74136edb91847fe9e4ff [diff] | |
| parent | 9073a5d9a51020c0bbbb11c1f5c1b519ecfc544f [diff] |
resolved conflicts for 9073a5d9 to stage-aosp-master Change-Id: I9b048cb5fe70215a67ef025e8c7ef6aad86cffb3