| commit | 2e3e2b4d029e7c6f92c418ba902837003db4c29a | [log] [tgz] |
|---|---|---|
| author | Andrew Solovay <asolovay@google.com> | Mon Sep 28 18:34:40 2015 -0700 |
| committer | Andrew Solovay <asolovay@google.com> | Mon Sep 28 18:34:40 2015 -0700 |
| tree | 216d662265e72f7239a8c82eed1777c504d0ef7d | |
| parent | 1a5ac2db406cd6bc13f7ce963ff2bd7cf483f39b [diff] | |
| parent | d32f3baf2b4f865a10c2b2a67e61a3069f85ab4f [diff] |
resolved conflicts for d32f3baf to mnc-mr-docs Change-Id: I2a919c2c881cc299ebc80fb66121756646e64adb