commit | 77b584e9c6c1d175026f69f1356f0ddcbab865d9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 22 19:31:25 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 22 19:31:25 2013 -0800 |
tree | 253f57038631606dd3a9c5c3ac31798d05e7aa65 | |
parent | 5a3ae719e85dffc6a8dbdb0cd6c088aa7ac4fd47 [diff] | |
parent | 0a8b1f4bf45cdd0eb65ed6c06e65398d0f3b4393 [diff] |
am 0a8b1f4b: am 2c464b0d: Merge commit \'a18b9d1e1a014290691d63a7f335085dadc83e46\' into HEAD * commit '0a8b1f4bf45cdd0eb65ed6c06e65398d0f3b4393':