| commit | 277936c83b9cf0fc1a27914de3e23b5c71621d34 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Mon Sep 21 14:25:34 2015 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Mon Sep 21 14:25:34 2015 -0700 |
| tree | 012aa447f8dd405c1927ec9e24ad7443a6f9631c | |
| parent | 9c7ea4906309d3859ed9466474ee38b1a3caa30f [diff] | |
| parent | 4acd56a5d8aae68e1cbd01bec252897ef74a3080 [diff] |
resolved conflicts for 5caca3dd to mnc-dr-dev-plus-aosp Change-Id: I773e514a8232b77cdd566dc36c9efc4e15f206f0