| commit | bead46972a7d6d1c4a37923a12f59fad06e76322 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Sep 02 21:09:32 2015 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Sep 02 21:09:32 2015 -0700 |
| tree | a31987017a5be6738bca56dcd907a31fb7ea70af | |
| parent | e097c1d0dbe9af59f7cb8506e1483465ea4c626e [diff] | |
| parent | b9f9575ca0c68b5110a24399f89abedce7362b5b [diff] |
resolved conflicts for merge of e9436908 to mnc-dr-dev-plus-aosp Change-Id: I6204a8463c553779c690bb29447a66cafe4d1038