| commit | b3aa8f48044db8fdb15e8dd2dc0fc10c85f25375 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Apr 30 09:31:44 2014 -0700 |
| committer | Kenny Root <kroot@google.com> | Wed Apr 30 09:33:22 2014 -0700 |
| tree | 1867438dfdc868744ddc17c7f4edcb1d0c0dfaeb | |
| parent | f53418931b40784964bf56104b409fe9b3934b3b [diff] | |
| parent | 3e320a0cac461859582d6b0a57f1d87182b996b9 [diff] |
resolved conflicts for merge of 3e320a0c to master Change already in frameworks/native as commit 51eb29fa9a2ffe9c5adb9ea25bfbd51992ff16a4 Change-Id: I23ae58c86dac91efb5210fdc4f080a1d6fb741c3