Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2011 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
| 16 | |
| 17 | #include <stdio.h> |
| 18 | |
| 19 | #include <utils/Log.h> |
| 20 | |
| 21 | #include "Fusion.h" |
| 22 | |
| 23 | namespace android { |
| 24 | |
| 25 | // ----------------------------------------------------------------------- |
| 26 | |
Mathias Agopian | eaf2d0b | 2011-06-13 16:00:49 -0700 | [diff] [blame] | 27 | /* |
| 28 | * gyroVAR gives the measured variance of the gyro's output per |
| 29 | * Hz (or variance at 1 Hz). This is an "intrinsic" parameter of the gyro, |
| 30 | * which is independent of the sampling frequency. |
| 31 | * |
| 32 | * The variance of gyro's output at a given sampling period can be |
| 33 | * calculated as: |
| 34 | * variance(T) = gyroVAR / T |
| 35 | * |
| 36 | * The variance of the INTEGRATED OUTPUT at a given sampling period can be |
| 37 | * calculated as: |
| 38 | * variance_integrate_output(T) = gyroVAR * T |
| 39 | * |
| 40 | */ |
| 41 | static const float gyroVAR = 1e-7; // (rad/s)^2 / Hz |
| 42 | static const float biasVAR = 1e-8; // (rad/s)^2 / s (guessed) |
| 43 | |
| 44 | /* |
| 45 | * Standard deviations of accelerometer and magnetometer |
| 46 | */ |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 47 | static const float accSTDEV = 0.05f; // m/s^2 (measured 0.08 / CDD 0.05) |
| 48 | static const float magSTDEV = 0.5f; // uT (measured 0.7 / CDD 0.5) |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 49 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 50 | static const float FREE_FALL_THRESHOLD = 0.981f; |
Max Braun | a01b4e2 | 2011-08-17 18:22:52 -0700 | [diff] [blame^] | 51 | static const float SYMMETRY_TOLERANCE = 1e-10f; |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 52 | |
| 53 | // ----------------------------------------------------------------------- |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 54 | |
| 55 | template <typename TYPE, size_t C, size_t R> |
| 56 | static mat<TYPE, R, R> scaleCovariance( |
| 57 | const mat<TYPE, C, R>& A, |
| 58 | const mat<TYPE, C, C>& P) { |
| 59 | // A*P*transpose(A); |
| 60 | mat<TYPE, R, R> APAt; |
| 61 | for (size_t r=0 ; r<R ; r++) { |
| 62 | for (size_t j=r ; j<R ; j++) { |
| 63 | double apat(0); |
| 64 | for (size_t c=0 ; c<C ; c++) { |
| 65 | double v(A[c][r]*P[c][c]*0.5); |
| 66 | for (size_t k=c+1 ; k<C ; k++) |
| 67 | v += A[k][r] * P[c][k]; |
| 68 | apat += 2 * v * A[c][j]; |
| 69 | } |
| 70 | APAt[j][r] = apat; |
| 71 | APAt[r][j] = apat; |
| 72 | } |
| 73 | } |
| 74 | return APAt; |
| 75 | } |
| 76 | |
| 77 | template <typename TYPE, typename OTHER_TYPE> |
| 78 | static mat<TYPE, 3, 3> crossMatrix(const vec<TYPE, 3>& p, OTHER_TYPE diag) { |
| 79 | mat<TYPE, 3, 3> r; |
| 80 | r[0][0] = diag; |
| 81 | r[1][1] = diag; |
| 82 | r[2][2] = diag; |
| 83 | r[0][1] = p.z; |
| 84 | r[1][0] =-p.z; |
| 85 | r[0][2] =-p.y; |
| 86 | r[2][0] = p.y; |
| 87 | r[1][2] = p.x; |
| 88 | r[2][1] =-p.x; |
| 89 | return r; |
| 90 | } |
| 91 | |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 92 | |
| 93 | template<typename TYPE, size_t SIZE> |
| 94 | class Covariance { |
| 95 | mat<TYPE, SIZE, SIZE> mSumXX; |
| 96 | vec<TYPE, SIZE> mSumX; |
| 97 | size_t mN; |
| 98 | public: |
| 99 | Covariance() : mSumXX(0.0f), mSumX(0.0f), mN(0) { } |
| 100 | void update(const vec<TYPE, SIZE>& x) { |
| 101 | mSumXX += x*transpose(x); |
| 102 | mSumX += x; |
| 103 | mN++; |
| 104 | } |
| 105 | mat<TYPE, SIZE, SIZE> operator()() const { |
| 106 | const float N = 1.0f / mN; |
| 107 | return mSumXX*N - (mSumX*transpose(mSumX))*(N*N); |
| 108 | } |
| 109 | void reset() { |
| 110 | mN = 0; |
| 111 | mSumXX = 0; |
| 112 | mSumX = 0; |
| 113 | } |
| 114 | size_t getCount() const { |
| 115 | return mN; |
| 116 | } |
| 117 | }; |
| 118 | |
| 119 | // ----------------------------------------------------------------------- |
| 120 | |
| 121 | Fusion::Fusion() { |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 122 | Phi[0][1] = 0; |
| 123 | Phi[1][1] = 1; |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 124 | |
| 125 | Ba.x = 0; |
| 126 | Ba.y = 0; |
| 127 | Ba.z = 1; |
| 128 | |
| 129 | Bm.x = 0; |
| 130 | Bm.y = 1; |
| 131 | Bm.z = 0; |
| 132 | |
| 133 | init(); |
| 134 | } |
| 135 | |
| 136 | void Fusion::init() { |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 137 | mInitState = 0; |
Max Braun | a01b4e2 | 2011-08-17 18:22:52 -0700 | [diff] [blame^] | 138 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 139 | mGyroRate = 0; |
Max Braun | a01b4e2 | 2011-08-17 18:22:52 -0700 | [diff] [blame^] | 140 | |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 141 | mCount[0] = 0; |
| 142 | mCount[1] = 0; |
| 143 | mCount[2] = 0; |
Max Braun | a01b4e2 | 2011-08-17 18:22:52 -0700 | [diff] [blame^] | 144 | |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 145 | mData = 0; |
| 146 | } |
| 147 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 148 | void Fusion::initFusion(const vec4_t& q, float dT) |
| 149 | { |
| 150 | // initial estimate: E{ x(t0) } |
| 151 | x0 = q; |
| 152 | x1 = 0; |
| 153 | |
Mathias Agopian | eaf2d0b | 2011-06-13 16:00:49 -0700 | [diff] [blame] | 154 | // process noise covariance matrix: G.Q.Gt, with |
| 155 | // |
| 156 | // G = | -1 0 | Q = | q00 q10 | |
| 157 | // | 0 1 | | q01 q11 | |
| 158 | // |
| 159 | // q00 = sv^2.dt + 1/3.su^2.dt^3 |
| 160 | // q10 = q01 = 1/2.su^2.dt^2 |
| 161 | // q11 = su^2.dt |
| 162 | // |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 163 | |
Mathias Agopian | eaf2d0b | 2011-06-13 16:00:49 -0700 | [diff] [blame] | 164 | // variance of integrated output at 1/dT Hz |
| 165 | // (random drift) |
| 166 | const float q00 = gyroVAR * dT; |
| 167 | |
| 168 | // variance of drift rate ramp |
| 169 | const float q11 = biasVAR * dT; |
| 170 | |
| 171 | const float u = q11 / dT; |
| 172 | const float q10 = 0.5f*u*dT*dT; |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 173 | const float q01 = q10; |
Mathias Agopian | eaf2d0b | 2011-06-13 16:00:49 -0700 | [diff] [blame] | 174 | |
| 175 | GQGt[0][0] = q00; // rad^2 |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 176 | GQGt[1][0] = -q10; |
| 177 | GQGt[0][1] = -q01; |
Mathias Agopian | eaf2d0b | 2011-06-13 16:00:49 -0700 | [diff] [blame] | 178 | GQGt[1][1] = q11; // (rad/s)^2 |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 179 | |
| 180 | // initial covariance: Var{ x(t0) } |
Mathias Agopian | eaf2d0b | 2011-06-13 16:00:49 -0700 | [diff] [blame] | 181 | // TODO: initialize P correctly |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 182 | P = 0; |
| 183 | } |
| 184 | |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 185 | bool Fusion::hasEstimate() const { |
| 186 | return (mInitState == (MAG|ACC|GYRO)); |
| 187 | } |
| 188 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 189 | bool Fusion::checkInitComplete(int what, const vec3_t& d, float dT) { |
| 190 | if (hasEstimate()) |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 191 | return true; |
| 192 | |
| 193 | if (what == ACC) { |
| 194 | mData[0] += d * (1/length(d)); |
| 195 | mCount[0]++; |
| 196 | mInitState |= ACC; |
| 197 | } else if (what == MAG) { |
| 198 | mData[1] += d * (1/length(d)); |
| 199 | mCount[1]++; |
| 200 | mInitState |= MAG; |
| 201 | } else if (what == GYRO) { |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 202 | mGyroRate = dT; |
| 203 | mData[2] += d*dT; |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 204 | mCount[2]++; |
| 205 | if (mCount[2] == 64) { |
| 206 | // 64 samples is good enough to estimate the gyro drift and |
| 207 | // doesn't take too much time. |
| 208 | mInitState |= GYRO; |
| 209 | } |
| 210 | } |
| 211 | |
| 212 | if (mInitState == (MAG|ACC|GYRO)) { |
| 213 | // Average all the values we collected so far |
| 214 | mData[0] *= 1.0f/mCount[0]; |
| 215 | mData[1] *= 1.0f/mCount[1]; |
| 216 | mData[2] *= 1.0f/mCount[2]; |
| 217 | |
| 218 | // calculate the MRPs from the data collection, this gives us |
| 219 | // a rough estimate of our initial state |
| 220 | mat33_t R; |
| 221 | vec3_t up(mData[0]); |
| 222 | vec3_t east(cross_product(mData[1], up)); |
| 223 | east *= 1/length(east); |
| 224 | vec3_t north(cross_product(up, east)); |
| 225 | R << east << north << up; |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 226 | const vec4_t q = matrixToQuat(R); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 227 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 228 | initFusion(q, mGyroRate); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 229 | } |
| 230 | |
| 231 | return false; |
| 232 | } |
| 233 | |
| 234 | void Fusion::handleGyro(const vec3_t& w, float dT) { |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 235 | if (!checkInitComplete(GYRO, w, dT)) |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 236 | return; |
| 237 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 238 | predict(w, dT); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 239 | } |
| 240 | |
| 241 | status_t Fusion::handleAcc(const vec3_t& a) { |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 242 | // ignore acceleration data if we're close to free-fall |
| 243 | if (length(a) < FREE_FALL_THRESHOLD) |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 244 | return BAD_VALUE; |
| 245 | |
| 246 | if (!checkInitComplete(ACC, a)) |
| 247 | return BAD_VALUE; |
| 248 | |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 249 | const float l = 1/length(a); |
| 250 | update(a*l, Ba, accSTDEV*l); |
| 251 | return NO_ERROR; |
| 252 | } |
| 253 | |
| 254 | status_t Fusion::handleMag(const vec3_t& m) { |
| 255 | // the geomagnetic-field should be between 30uT and 60uT |
| 256 | // reject obviously wrong magnetic-fields |
| 257 | if (length(m) > 100) |
| 258 | return BAD_VALUE; |
| 259 | |
| 260 | if (!checkInitComplete(MAG, m)) |
| 261 | return BAD_VALUE; |
| 262 | |
| 263 | const vec3_t up( getRotationMatrix() * Ba ); |
| 264 | const vec3_t east( cross_product(m, up) ); |
| 265 | vec3_t north( cross_product(up, east) ); |
| 266 | |
| 267 | const float l = 1 / length(north); |
| 268 | north *= l; |
| 269 | |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 270 | update(north, Bm, magSTDEV*l); |
| 271 | return NO_ERROR; |
| 272 | } |
| 273 | |
Max Braun | a01b4e2 | 2011-08-17 18:22:52 -0700 | [diff] [blame^] | 274 | void Fusion::checkState() { |
| 275 | // P needs to stay positive semidefinite or the fusion diverges. When we |
| 276 | // detect divergence, we reset the fusion. |
| 277 | // TODO(braun): Instead, find the reason for the divergence and fix it. |
| 278 | |
| 279 | if (!isPositiveSemidefinite(P[0][0], SYMMETRY_TOLERANCE) || |
| 280 | !isPositiveSemidefinite(P[1][1], SYMMETRY_TOLERANCE)) { |
| 281 | LOGW("Sensor fusion diverged; resetting state."); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 282 | P = 0; |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 283 | } |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 284 | } |
| 285 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 286 | vec4_t Fusion::getAttitude() const { |
| 287 | return x0; |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 288 | } |
| 289 | |
| 290 | vec3_t Fusion::getBias() const { |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 291 | return x1; |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 292 | } |
| 293 | |
| 294 | mat33_t Fusion::getRotationMatrix() const { |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 295 | return quatToMatrix(x0); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 296 | } |
| 297 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 298 | mat34_t Fusion::getF(const vec4_t& q) { |
| 299 | mat34_t F; |
| 300 | F[0].x = q.w; F[1].x =-q.z; F[2].x = q.y; |
| 301 | F[0].y = q.z; F[1].y = q.w; F[2].y =-q.x; |
| 302 | F[0].z =-q.y; F[1].z = q.x; F[2].z = q.w; |
| 303 | F[0].w =-q.x; F[1].w =-q.y; F[2].w =-q.z; |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 304 | return F; |
| 305 | } |
| 306 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 307 | void Fusion::predict(const vec3_t& w, float dT) { |
| 308 | const vec4_t q = x0; |
| 309 | const vec3_t b = x1; |
| 310 | const vec3_t we = w - b; |
| 311 | const vec4_t dq = getF(q)*((0.5f*dT)*we); |
| 312 | x0 = normalize_quat(q + dq); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 313 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 314 | // P(k+1) = F*P(k)*Ft + G*Q*Gt |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 315 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 316 | // Phi = | Phi00 Phi10 | |
| 317 | // | 0 1 | |
| 318 | const mat33_t I33(1); |
| 319 | const mat33_t I33dT(dT); |
| 320 | const mat33_t wx(crossMatrix(we, 0)); |
| 321 | const mat33_t wx2(wx*wx); |
| 322 | const float lwedT = length(we)*dT; |
| 323 | const float ilwe = 1/length(we); |
| 324 | const float k0 = (1-cosf(lwedT))*(ilwe*ilwe); |
| 325 | const float k1 = sinf(lwedT); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 326 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 327 | Phi[0][0] = I33 - wx*(k1*ilwe) + wx2*k0; |
| 328 | Phi[1][0] = wx*k0 - I33dT - wx2*(ilwe*ilwe*ilwe)*(lwedT-k1); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 329 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 330 | P = Phi*P*transpose(Phi) + GQGt; |
Max Braun | a01b4e2 | 2011-08-17 18:22:52 -0700 | [diff] [blame^] | 331 | |
| 332 | checkState(); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 333 | } |
| 334 | |
| 335 | void Fusion::update(const vec3_t& z, const vec3_t& Bi, float sigma) { |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 336 | vec4_t q(x0); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 337 | // measured vector in body space: h(p) = A(p)*Bi |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 338 | const mat33_t A(quatToMatrix(q)); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 339 | const vec3_t Bb(A*Bi); |
| 340 | |
| 341 | // Sensitivity matrix H = dh(p)/dp |
| 342 | // H = [ L 0 ] |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 343 | const mat33_t L(crossMatrix(Bb, 0)); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 344 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 345 | // gain... |
| 346 | // K = P*Ht / [H*P*Ht + R] |
| 347 | vec<mat33_t, 2> K; |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 348 | const mat33_t R(sigma*sigma); |
| 349 | const mat33_t S(scaleCovariance(L, P[0][0]) + R); |
| 350 | const mat33_t Si(invert(S)); |
| 351 | const mat33_t LtSi(transpose(L)*Si); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 352 | K[0] = P[0][0] * LtSi; |
| 353 | K[1] = transpose(P[1][0])*LtSi; |
| 354 | |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 355 | // update... |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 356 | // P -= K*H*P; |
| 357 | const mat33_t K0L(K[0] * L); |
| 358 | const mat33_t K1L(K[1] * L); |
| 359 | P[0][0] -= K0L*P[0][0]; |
| 360 | P[1][1] -= K1L*P[1][0]; |
| 361 | P[1][0] -= K0L*P[1][0]; |
Mathias Agopian | 3301542 | 2011-05-27 18:18:13 -0700 | [diff] [blame] | 362 | P[0][1] = transpose(P[1][0]); |
| 363 | |
| 364 | const vec3_t e(z - Bb); |
| 365 | const vec3_t dq(K[0]*e); |
| 366 | const vec3_t db(K[1]*e); |
| 367 | |
| 368 | q += getF(q)*(0.5f*dq); |
| 369 | x0 = normalize_quat(q); |
| 370 | x1 += db; |
Max Braun | a01b4e2 | 2011-08-17 18:22:52 -0700 | [diff] [blame^] | 371 | |
| 372 | checkState(); |
Mathias Agopian | 984826c | 2011-05-17 22:54:42 -0700 | [diff] [blame] | 373 | } |
| 374 | |
| 375 | // ----------------------------------------------------------------------- |
| 376 | |
| 377 | }; // namespace android |
| 378 | |