| commit | 2e93e28a830466a3aa5548939d83905f9bb1a165 | [log] [tgz] |
|---|---|---|
| author | Daniel Rosenberg <drosen@google.com> | Fri Aug 26 16:54:46 2016 -0700 |
| committer | Daniel Rosenberg <drosen@google.com> | Wed Aug 31 00:04:22 2016 +0000 |
| tree | b944c01e8f1dfd0b0cab7a5cffb8de0ed98453d8 | |
| parent | d27d91e712c57e89d4f0a9adb87fa6e41d5370d4 [diff] |
sdcard: Fix bad merge A few changes got dropped along merge resolution. This adds them back Affected CLs: Ie188cb044be2ad87166f2d43c32a1f6b97660de0 Ibdb72ad16a1e6c3a01edcb03d003c42de7a03cd6 Change-Id: I1924f5a4bd7564ceaf9bb3a45b7fb7804b3619d7