commit | ae8f12c1d7f830f700550bfc62e8b196373e0682 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 05 12:38:06 2013 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 05 12:38:06 2013 -0800 |
tree | 73e4633b6b2d62d0559f8a8e8e2aca47d71ec0e8 | |
parent | 38da29bfdb291192d823dac006ec9aab09a862c0 [diff] | |
parent | 55d8221c140267969d0c21629a594987e12daa0c [diff] |
Merge commit '55d8221c140267969d0c21629a594987e12daa0c' into HEAD