| commit | 7dbed399cbef000e3131464f9051db6aceffda7e | [log] [tgz] |
|---|---|---|
| author | Dan Austin <danielaustin@google.com> | Wed Sep 16 17:19:44 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 16 17:19:44 2015 +0000 |
| tree | fa3588c743c84675ea4d442f41c7a157df5cd523 | |
| parent | 9d46697e3bd1af0f7150703a0b6b3ab17fa630c3 [diff] | |
| parent | 33cb1ec2386e3d41c5c5eeff5a904dd13772aa93 [diff] |
Merge "Revert "resolved conflicts for c82fcdda to stage-aosp-master"" into stage-aosp-master