| commit | 57a082f4de1864daf545e9f11f7373a409614326 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Aug 21 15:12:28 2015 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Fri Aug 21 15:12:28 2015 -0700 |
| tree | 65336b7aea776cdde82ee948cf9f3130b60aa3b4 | |
| parent | d64bf33890687f97b7c04bb6398b366cf197d41f [diff] | |
| parent | b21de5f627f3d2f06000f9b61ad17228cb09b385 [diff] |
resolved conflicts for merge of b21de5f6 to mnc-dev-plus-aosp Change-Id: Ia0c7f2e33e22b2419811f7e68da276e02e156d08